Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Thu, 14 Jan 2010 14:19:01 +0000 (22:19 +0800)
committerJason Rumney <jasonr@gnu.org>
Thu, 14 Jan 2010 14:19:01 +0000 (22:19 +0800)
commit3b1ddcc80f2e5330ee7f855aecfe5124374ec43c
treef4c2215683d0cc1644ac47410f04489966a8291e
parent2f0dd9d47a589ef5e7325da26188e1e60ecc3c1c
parent0edde58eb7693aa9919e5054d5647a045de56772
Merge from trunk